From: Magnus Henoch <mange@freemail.hu>
Date: Sun, 17 Dec 2006 17:00:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~3393
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1e53aaf3231c8e41f37f52ae193e227716ad4ae0;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 386987050f9..c4a22bd314e 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -2,6 +2,18 @@
 
 	* url-gw.el (url-gateway-nslookup-program): Doc fix.
 
+2006-12-08  Magnus Henoch  <mange@freemail.hu>
+
+	* url-proxy.el (url-proxy-object): New variable.
+	(url-proxy): Bind it instead of `proxy-object'.
+
+	* url-http.el (url-http-create-request): Remove url argument, use
+	the buffer-local variable `url-http-target-url' instead.  Both
+	callers updated.  Simplify proxy handling.
+	(url-http): Don't make proxy-object buffer local.
+
+	* url.el (url-retrieve-internal): Bind url-proxy-object to nil.
+
 2006-11-26  Magnus Henoch  <mange@freemail.hu>
 
 	* url-http.el (url-http-wait-for-headers-change-function): Use